From 77c1b7c3438a6d6d3060eddb5a66aa02095ded38 Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Thu, 28 Oct 2021 18:24:00 -0600
Subject: [PATCH] fix windows release with Qt6. (#748)

* fix windows release with Qt6.

windeployqt failed to deploy Qt6Core5Compat.dll because it was
not used by the gui and we didn't tell windeployqt there was
another executable to scan for dependencies.

* fiddle with github cache conditionals.

cache was restored, but we tried to install qt anyway.

* Revert "fiddle with github cache conditionals."

This reverts commit fece79e5e56de2f957960236bb851c6bc7682d7c.

* try to get github action conditionals working again.

* Revert "try to get github action conditionals working again."

This reverts commit 3152108e5267580f3836b9f6aadc7dfa2ecfe347.

* work around apparent bug in github action conditonal processing.

* the second half of the workaround

* fool around with bash

* more bash foolishness.
---
 .github/workflows/macos.yml    |  6 +++---
 tools/make_windows_release.ps1 |  2 +-
 tools/travis_install_osx       | 10 +++++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index b0ee03c8c..0ad0cfaa0 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -111,10 +111,10 @@ jobs:
 
     - name: Qt install
       if: steps.cache.outputs.cache-hit != 'true'
+      env:
+        TRAVIS_BUILD_DIR: ${{ github.workspace }}
       run: |
-        pip3 install aqtinstall>=2.0.0
-        ./tools/ci_install_qt.sh mac ${QT_VERSION} clang_64 ${HOME}/Cache/Qt
-        echo "export PATH=${HOME}/Cache/Qt/${QT_VERSION}/macos/bin:\$PATH" > "${HOME}/Cache/qt-${QT_VERSION}.env"
+        ./tools/travis_install_osx ${QT_VERSION} aqt
 
     - name: Script
       run: |
diff --git a/tools/make_windows_release.ps1 b/tools/make_windows_release.ps1
index 236e3ec1f..54ebefc0e 100755
--- a/tools/make_windows_release.ps1
+++ b/tools/make_windows_release.ps1
@@ -105,7 +105,7 @@ New-Item "$($gui_build_dir)\package" -type directory -Force | Out-Null
 Copy-Item "$($gpsbabel_build_dir)\release\GPSBabel.exe" "$($gui_build_dir)\package\GPSBabel.exe"
 Copy-Item "$($gui_build_dir)\release\GPSBabelFE.exe" "$($gui_build_dir)\package\GPSBabelFE.exe"
 # use --plugindir option to locate the plugins.
-& "$($windeployqt)" --verbose 1 --plugindir package\plugins package\GPSBabelFE.exe
+& "$($windeployqt)" --verbose 1 --plugindir package\plugins package\GPSBabelFE.exe package\GPSBabel.exe
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
 if ($buildinstaller -eq "true") {
     Set-Location "$($gpsbabel_src_dir)\gui"
diff --git a/tools/travis_install_osx b/tools/travis_install_osx
index 3f6677ead..64ba6775d 100755
--- a/tools/travis_install_osx
+++ b/tools/travis_install_osx
@@ -33,7 +33,11 @@ METHOD=${2:-artifactory}
 
 # our expectation is that install-qt creates $QTDIR, $QTDIR/bin.
 CACHEDIR=${HOME}/Cache
-QTDIR=${CACHEDIR}/Qt/${QT_VERSION}/clang_64
+if [ "$METHOD" = "aqt" ]; then
+  QTDIR=${CACHEDIR}/Qt/${QT_VERSION}/macos
+else
+  QTDIR=${CACHEDIR}/Qt/${QT_VERSION}/clang_64
+fi
 
 if [ -d "${QTDIR}/bin" ]; then
   echo "Using cached Qt."
@@ -73,6 +77,10 @@ else
         rm -f "/tmp/${archive}"
       fi
      )
+  elif [ "$METHOD" = "aqt" ]; then
+    pip3 install aqtinstall>=2.0.0
+    "${TRAVIS_BUILD_DIR}/tools/ci_install_qt.sh" mac "${QT_VERSION}" clang_64 "${CACHEDIR}/Qt"
+    echo "export PATH=${CACHEDIR}/Qt/${QT_VERSION}/macos/bin:\$PATH" > "${CACHEDIR}/qt-${QT_VERSION}.env"
   else
     # install-qt creates the install at $PWD/Qt.
     QT_VERSION_SHORT=${QT_VERSION//./}
-- 
2.30.2